From 96403247eb6b2c8da2592f370f53a29bb892e428 Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Thu, 30 Nov 2006 15:57:15 -0700 Subject: [PATCH] [IA64] Fix sparse tree xenoprof/perfmon/oprofile build dependencies Compile xenoprof perfmon related hypercall even when CONFIG_PERFMON, CONFIG_OPROFILE, CONFIG_OPROFILE_MODULE are disabled. They should be compiled in vmlinux unconditionally because they might be called by other modules in theory. Signed-off-by: Isaku Yamahata --- linux-2.6-xen-sparse/arch/ia64/xen/xcom_hcall.c | 4 ---- linux-2.6-xen-sparse/arch/ia64/xen/xcom_mini.c | 4 ---- linux-2.6-xen-sparse/include/asm-ia64/hypercall.h | 2 -- linux-2.6-xen-sparse/include/asm-ia64/xen/xcom_hcall.h | 8 -------- 4 files changed, 18 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/xcom_hcall.c b/linux-2.6-xen-sparse/arch/ia64/xen/xcom_hcall.c index ec46b84037..49f9ea6708 100644 --- a/linux-2.6-xen-sparse/arch/ia64/xen/xcom_hcall.c +++ b/linux-2.6-xen-sparse/arch/ia64/xen/xcom_hcall.c @@ -304,7 +304,6 @@ xencomm_hypercall_suspend(unsigned long srec) return xencomm_arch_hypercall_suspend(xencomm_create_inline(&arg)); } -#if defined(CONFIG_OPROFILE) || defined(CONFIG_OPROFILE_MODULE) int xencomm_hypercall_xenoprof_op(int op, void *arg) { @@ -336,9 +335,7 @@ xencomm_hypercall_xenoprof_op(int op, void *arg) return xencomm_arch_hypercall_xenoprof_op(op, xencomm_create_inline(arg)); } -#endif -#ifdef CONFIG_PERFMON int xencomm_hypercall_perfmon_op(unsigned long cmd, void* arg, unsigned long count) { @@ -366,4 +363,3 @@ xencomm_hypercall_perfmon_op(unsigned long cmd, void* arg, unsigned long count) xencomm_create_inline(arg), count); } -#endif diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/xcom_mini.c b/linux-2.6-xen-sparse/arch/ia64/xen/xcom_mini.c index adc01f1fd5..a2f2c97ac4 100644 --- a/linux-2.6-xen-sparse/arch/ia64/xen/xcom_mini.c +++ b/linux-2.6-xen-sparse/arch/ia64/xen/xcom_mini.c @@ -323,7 +323,6 @@ xencomm_mini_hypercall_xen_version(int cmd, void *arg) } EXPORT_SYMBOL(xencomm_mini_hypercall_xen_version); -#if defined(CONFIG_OPROFILE) || defined(CONFIG_OPROFILE_MODULE) int xencomm_mini_hypercall_xenoprof_op(int op, void *arg) { @@ -372,9 +371,7 @@ xencomm_mini_hypercall_xenoprof_op(int op, void *arg) return xencomm_arch_hypercall_xenoprof_op(op, desc); } EXPORT_SYMBOL_GPL(xencomm_mini_hypercall_xenoprof_op); -#endif -#ifdef CONFIG_PERFMON int xencomm_mini_hypercall_perfmon_op(unsigned long cmd, void* arg, unsigned long count) @@ -418,4 +415,3 @@ xencomm_mini_hypercall_perfmon_op(unsigned long cmd, void* arg, return xencomm_arch_hypercall_perfmon_op(cmd, desc, count); } EXPORT_SYMBOL_GPL(xencomm_mini_hypercall_perfmon_op); -#endif diff --git a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h index 67b8526f69..4b5ea2dae0 100644 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h @@ -399,7 +399,6 @@ HYPERVISOR_expose_p2m(unsigned long conv_start_gpfn, } #endif -#ifdef CONFIG_PERFMON static inline int xencomm_arch_hypercall_perfmon_op(unsigned long cmd, struct xencomm_handle *arg, @@ -408,7 +407,6 @@ xencomm_arch_hypercall_perfmon_op(unsigned long cmd, return _hypercall4(int, ia64_dom0vp_op, IA64_DOM0VP_perfmon, cmd, arg, count); } -#endif // for balloon driver #define HYPERVISOR_update_va_mapping(va, new_val, flags) (0) diff --git a/linux-2.6-xen-sparse/include/asm-ia64/xen/xcom_hcall.h b/linux-2.6-xen-sparse/include/asm-ia64/xen/xcom_hcall.h index df5204f469..79e790d75b 100644 --- a/linux-2.6-xen-sparse/include/asm-ia64/xen/xcom_hcall.h +++ b/linux-2.6-xen-sparse/include/asm-ia64/xen/xcom_hcall.h @@ -46,14 +46,10 @@ extern unsigned long xencomm_hypercall_hvm_op(int cmd, void *arg); extern int xencomm_hypercall_suspend(unsigned long srec); -#if defined(CONFIG_OPROFILE) || defined(CONFIG_OPROFILE_MODULE) extern int xencomm_hypercall_xenoprof_op(int op, void *arg); -#endif -#ifdef CONFIG_PERFMON extern int xencomm_hypercall_perfmon_op(unsigned long cmd, void* arg, unsigned long count); -#endif /* Using mini xencomm. */ extern int xencomm_mini_hypercall_console_io(int cmd, int count, char *str); @@ -77,14 +73,10 @@ extern int xencomm_mini_hypercall_memory_op(unsigned int cmd, void *arg); extern unsigned long xencomm_mini_hypercall_hvm_op(int cmd, void *arg); -#if defined(CONFIG_OPROFILE) || defined(CONFIG_OPROFILE_MODULE) extern int xencomm_mini_hypercall_xenoprof_op(int op, void *arg); -#endif -#ifdef CONFIG_PERFMON extern int xencomm_mini_hypercall_perfmon_op(unsigned long cmd, void* arg, unsigned long count); -#endif /* For privcmd. Locally declare argument type to avoid include storm. Type coherency will be checked within privcmd.c */ -- 2.30.2